Importing upstream version 1.4.4
authorBernd Zeimetz <bernd@bzed.de>
Tue, 21 May 2013 22:34:23 +0000 (00:34 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 21 May 2013 22:34:23 +0000 (00:34 +0200)

Trivial merge